Fix last line return statements