Code Standard fixes