Fix build break
Fix build warnings