Misc customer fixes