fix elsewhere refactor bugs

Fix bugs introduced by elsewhere refactor (#1369).