small fixes pre 0.6