Miscellaneous small issues

Three little things that I noticed in S2E while working with it over the weekend.