Minor changes to ensure compatibility with target system (running Python 2.5)