Modified couple of mistakes