Minor fixes from code review
Minor fixes from code review

errordeveloper/fe-devel,errordeveloper/fe-devel,errordeveloper/fe-devel,errordeveloper/fe-devel,chbfiv/fabric-engine-old,chbfiv/fabric-engine-old,errordeveloper/fe-devel,chbfiv/fabric-engine-old,chbfiv/fabric-engine-old,errordeveloper/fe-devel,chbfiv/fabric-engine-old,chbfiv/fabric-engine-old,errordeveloper/fe-devel,chbfiv/fabric-engine-old