Increased compatibility for installer.py