Fixes for image loader and IAP