A few more updates to make reduce type-check