fix Types imports and fix scan warning