(fix) Couple of errors