fixes for 0.32