Fixed minor mistakes from prev commit