[BUGFIX] Pull in metadata with fal 6.2

Fixes #515
[BUGFIX] Fix cgl cleanup introduced bugs