fix various trac items