Add issues 356, 357, 358