Package fixes and extra formatting