Fixed function calls to compile right