little tweaks on FS abstract layer