small fixes for 0.0.9