[#805] Various changes