Fix the rest of the return types because they were mising.