Fix more spacing issues