Misc fix
Fix build