Fixes based on @kenchris's review.