Bug fixes and synchro improvements