Important fixes for now.

The only 'must have' fix for jumbo-8.