Cleanup of some warnings, edge generation code in Downtown