Fixed function call errors