Make some final changes to the new syntax