[feature038] some fixes