CR fixes FK10