More work fixing paths and ld_library_path for docker #497