additional fixes for new syntax