few bug resolution