coordinate mapping fixes