Minors cleanup