Fixes to compile with new core release