fixes for 0.9.95