Trimming and tweaks