refs #21 Add bug fixes to FSD