Merging more of intervirgilium's changes