minor update - 2 issues fix