Minor map builder issues

Here are 2 of the minor fixes I came across.