Fix issues: 342, 424, 428, 430, 436
6 files changed