Fixed some smaller errors