Small set of error fixes