Fix imports & add missing type signatures