Fixing compatibility issues with pip v1.5