Fixed function types and returns