Update with new bugs found during Sofi's test