Some trigger fixes: marrakech