Fixed a few terrible 'this' context issues.