small Marina's fixes