BUG Fix all code paths

This is an extension of the previous fix for all code paths.

Also, fix format for Python 2.6 (must explicitly number format fields).