Fix style errors after merging with master