More changes to top-level code