Issue #36: Make the yaml valid please!