Misc

Too lazy to make separate pull requests for each of these commits...