some map changes, Mint compatibility changes

mostly to let a Mint user compile