Allow for existing single image definition. Other minor improvements.