Fixes after new Types structure.