More tweaks to come into compliance with coding standards