Misc customer fixes

This makes much more sense than the other pattern.