Fix rust issues