Fixed some trivial problems