Some coding standards issues fixes