Assorted fix