Misc fixes to fix Flocons... again