OverUnwatched fixes

Not sure if any are in use, but changing case (just-in-case)
OverlayUnwatched fixes

Step 2 of previous commit