[CHORE] minor fixes and updates