#460 various metadata fixes