Fixes on location