several fixes for new syntax