Preprocessing fixes.