Little error fixes