MemberMapper Fixes