Fixed returns in parsing functions