Domain Checking Fixes. Map fixes