Added few missing function calls