Added some 'self's, fixes #4