Fix issues uncovered with docker v1.0.1