Additional fixes to bring in line with current core API