Minor cruft fixes