Fix type declarations