Fixed bad return types.