Fixing many callbacks to return correct this object.