FIxed some issues