Fixed issues surrounding the different components of the bindings of types.