Fixing parser things