Fix some Circle CI stuff