Commented out some obvious type errors