More installation fixes