Fix some lingering code style issues