minor fixes & cli providers