Fixed a bunch of installer stuff for Naomi