FIX changes for post-0.1 cygnus version