Set of Bug Fixes for FS support