Fixing an array of coding standards issues & minor bug fixes #611374, #611890, #612932, #545428 by lncrn8