Fixed some minor problems