Location: Fix some code