Fix exits into returns