a few more minor fixups for docker 0.10 and syntax