Fix some return statements