Preliminary location rule constraint fixes