Fixes for multiple Cirrus

#120