Small changes for testing work-in-progress