Prepare for blackbird tweaks