2 FS bugs corrected

FS4909
FS4910