Fixes for packaging related things