Additional F18 fixes