Miscellaneous small issues

A few little things I noticed while working with S2E over the weekend.