Minor tweaks (shaper).