Fixes

These are the two fixes we discussed, @benkirzhner.  Please review.