Fixes to Dockerfile