More bugout tweaks.