fixes for v34