3.6 compatibility fixes
Tiny format fixes.