Adjust to latest typescript