Hopefully last nitpicking packaging commit for now