Some fixes for FS testing