Changes from @dalelotts comments.