Fix some style quirks