Clean up flakes warnings.
Moved hacking to core.