Some old modifications that I neglected to commit earlier