Further compat changes to make modeling work