Fixing parser issues