Assorted theoretical fixes