Fixed a few remaining coding standards problems