Some smallish changes...