etc fixes