Fix some type declarations