20150417 city.delhi: Fix issues that lead to accidents