Couple of fixes to requires in core