Image loading fixes