Fix the Non-static function call warnings.
fixes #16