More .format fixes for 2.6 backcompat