Fixes on parse