Fixed an address-sweeping problem, among other little bugs