Few more fixes and alterations for func calls