Revert to TUNA Time
shrinker: Fix compilation errors