fix copy-past-mistakes

code uses variable instead $this, call missing functions

Change-Id: Ib44f9c1c0d2c327663939f2b5a0e150a480b55cb
Merge "fix copy-past-mistakes"