Fixing static type errors.