Various changes to ensure consistency in VME updates and FS generation.