Few issues fixed