Adds missing return statements

Looked for all bugs like this and fixed them.