Some fix in code