Tweaks w/ global madness