More magic location stuff