Fix Bugs

Update Tools and fix warning issues