Some more D7 changes