Fixup a few remaining style issues