Two minor improvements which did not fit elsewhere

[adamreichold]

Will merge this without review due to the security issue automatically reported in #85 (which should not affect us at the moment as we have no POST handlers consuming request bodies).