Bug fixes

No bouncing between data centers