Added a few missing 'return self'