Did some minor updates, based on a couple of reports from the aforementioned thread.