misc topology fixes

Change-Id: Ib5d72ea4faefb6c4fecba55b828c74fa7d15978c