Cleanups, fixing bundle download.