Some fix issues