Further FS-lite import prep work