Correcting mistakes from previous commits