Fixups to style