Fix missed return statements