A few little tweaks with docker 1.x