Fix a few more style hiccups