Fix some map errors (flow and light problems)