Incorped some changes / properties for #846.