Fixed issues in the OS maker scripts, and hopefully solved the OBI grub issues