make stuff compile again as some types are back in the core