updates to work with new rust version