Fix install bugs