Change bootstrap due to recent changes in spoon.
Sync up with recent changes to tasks.