Fixed Reply Partial + other fixes