0.04 small fixes