I'm going to make a separate PR for the other targets - I found quite a few things of cruft to hit while going at it