Reverted some fixes and some other fixes for new dedicated api