Minor (re)fixes