More image controller updates