Moved to the latest native packager plugin and fixed up some style issues