Couple of quick changes and package updates for things to come