fixes to fsh