core: few fixes
few fixes