Fixes regarding the 'this' arg