Fix warnings
changes