Some fixes for FLC