Minor fixes for FSI code.

Tracker item: 2293