[IMP]: small type improvements