fixes for rust