Additional install fixes