Fixed bug and a warn
Fixed warns
Fixed warnings