fixes for 0.25