More fixes for BaseMap router.

Also upgraded stubmodule to fix failing tests.