Petty changes

I haven't done any real testing. Nothing here even warrants more than a visual inspection, IMO.