Fixed calls for latest poc changes