fixes for current rust