Some more interface change fixes