WIP: typespec fixes