Fixing install issues