Fixes for issues found in Jesse's review.