Minor fixes and cleanup from yesterday.