some fixes for Enthought Canopy (#41)