Some stupid return value fixes