Initial format fixes