Fix CI

Fixes #1
Fixes #2