BugFixes for commands and docker API reformat from Miks