Fixed other minor problems