HACK: Add some debug helpers