Partial 2.4.10 Resolve Pending Issues

Furthered things a little