Few minor fixes found during addon testing