Fix some style problems