Various tweaks to get headers/source back up to coding standards