Fix some formatting issues etc.