A few fixes for better Parsing