Fix some minor problems