Coding guideline fixes