Fixed type errors
More type errors, at 493 now.