Improve error locations