Styling fixes, probably caused by merging master