Various small pending updates and fixes that have been accumulating and needed a commit.