More User and Message fixes to operator<