Bundle tweaks
Guard style all the things.