More small format fixes.