Fix-ups from param move