Moving more items into BMO and fixing the installer