More syntax tag fixes