Fixed a few minor problems