minor fixes before starting in ASD