Emit some metadata!
Fix a couple o' crashes