Enhance flush triggering. fix #6
Rebuild packages