Various more transitional fixes (hopefully last ones)