Fixes some problems with some modesl and pypump