Image handling improvements