Fix formatting problems from last push