Fix addXXX/removeXXX source calls