Thanks Wolf_Shield. I have both of those fixed in my dev version.