Misc collection of adjustments while preparing plugin for packaging