Fix install issues