Fix some style bugs