Fix 'self lifetimes

Change the lifetimes from 'self -> 'a