Some more editorial fixes