Fixed many many type issues