Installation bug fixes