Misc fix
Fix build with strict flags