Replace a few more things