Fixed things pending after last refactoring.