Fixes in response to review from bent.