F18 release fixes