Fixed some more minor problems