Fix some issues with installation not working