Couple of error fixes