More warnings fixes