Small Docker 1.1 compatibility fixes