Image migrate fixes.
Fixes for CLI installation.