More YML fixes.