Pre-contribution fixes.