Added a few missing selfs