@rsplak Can you please add fixes for this in this pull request?