Corrected two small coding mistakes from the previous commit