Fix some style issues