Some changes to ensure that other refactoring doesn't break these too
much