Fix faulty stuffs