I'm guessing these two changes are not really related, but fine by me to have them here...