Clean up more issues w/ Location instantiation