fixes for core helpers