Deep access to courier, minor cleanup