Cleanup stuff

Several unrelated commits for which again I'm too lazy to make separate PRs *shrug*