Fixups per smarterclayton comments