fixes for marigo syst