Few minor fixes found during addon testing

fix #1134