Minor changes related to py2exe bundling