Small Improvements on the Map Engine