Address a variety of issues brought up by jnthn