*8445* Tweaks