Build/install fixes