Fix some map math