Fix breakage resulting from various refactors