Fix unmatched returns dialyzer warnings