"Most" minor fixes