Some more preprocessing