More stub changes to match Ian's base.nsi. Not working yet.