Fix coordination bugs.