minor changes to hopefully fix piefed & mbin