Additional changes to c3982da