More rust fixes