Fixed 2 minor problems