A few more things to attempt to replace.