Improve map clipping