Tweaks for static cross tools