Fix a few "this" context errors