Added some assorted minimal things