fix self/this references