Fixes of location type errors