More yaml fixing.