Fix scan code button
Remove unused param
More syncing workarounds and fixes