More F18 changes

... but probalby not useful towards goal of building an iso.