Fixes and a hint of flow control