Warning fixes
More warnings