More warnings
Fix new warnings, build warning-free