Fix return statements