Final fixes for installation