Tweaks from cutting the parts for real