Fixing up some return types
Woops