Additional updates that didn't make the previous commit