Caught a few more things to update