fixes for 0.29