Changes to fix install errors