New image callback mechanics related fixes