1.0.7 small fixes