small fixes

Great work on this!  Exactly what I needed.  Here are two minor fixes I had to apply to get it running.