Fix issue with Types not being correct.