Issue #127: Adding missing self keywords