XS tweaks from bulk88