Fix styling bugs introduced in previous commits