YAML related fixes

Signed-off-by: Dirk Jesse <office@highresolution.info>