A few more spacing improvements