Minor updates as I look at the code for more potential fixes.