Some fixes
Resync branch