Fix flip encryption and all known flip synchronization issues