fix build: bad insertion with 4.2.2 merge
a couple more build fixes
fix build again
remove duplicates
fix build
another build fix
ugh
fix notification manager
derp