More work on some pending issues.