Last updates prior to talk
Fixed error noted by Will