Fixed both issues. PR is updated.