Fix issue where I added too many methods to the wrong objects