Fixed missing return statements + indirection