Fixed errors for parsing