More transitional fixes