Fix bugs induced by packaging tweak