more residency fixes