Better handling of patching kitcreator and building Nano package