Fix a few nits in prepare_env and dockerfile