FIxed some errors