Fix minor problems