Fix some issues with install