Hotfix/vulnerability fixes (#87)