Minor internal changes to the module package