Image adapter and adapter GD fixes [ci skip]