Small fixes for an ordering issue with determining start elements