Release24 spec cleanup

Backported some of the cleanup to 2.4, and a bugfix