Fix bugs due to recent code standards enforcement
Fix bugs due to recent code standards enforcement