Various docker updates