Fix synchronizing for faster transfer starting, cleanup