Fixing type errors

type errors associated with changing Location