Some format fixes.