Make a few more changes