Pre-bundle checks

Making sure everything is properly in place before trying to change
things up.