More warnings fixes
