Various format fixes.