Very minor fixes around typescript not supporting union types in this version