Some changes to graphics/eog3, taken from MC