Some fix's in code