Fixes for latest Docker