Location fixes

Signed-off-by: Tim Traver <ttraver@mivamerchant.com>