Image api fixes