Fix a few minor issues with the Dockerfile (both for buildability and cacheability)