Fix CI + other stuff