Some minor, unofficial fixes/tests while I wait for the laundry to finish.