Cleaning up more errors in typescript.