Minor fixes, and more work on MapBuilder