CR Fix and adding missing typings