[PR] Various updates and fixes from production use