fixes for 0.33