Fixed warnings related to return types.