Bug fixes for FS vis