More fixes from AMD upgrade - fix draw services - add streets as TOC Layer