Fixes Flocon

Closes #570 and #571