Install procedure fixes