fixes for new syntax