Sync devtools
Fix style issues