Fixes due upstream changes in Fluo (#9)