Assorted clean ups