Further fixes for new syntax