misc small QA fixes