Fix some formatting problems