some fixes to new entry points