Fixed some thing everywhere