Fixes to core, started helpers.