fixes for new topology