Removal of warnings in FS