Fixes to comply with the latest core changes