Assorted modifications