WX Map bug fixes