akorotkov Further fixes for Dockerfile