Fixes for changes in the Docker 0.6.5 api