Asorted fix.