Fixes for dockerfile