misc tiny changes