Fix up return types of a bunch of methods