Fixes to programmer events
Merge branch 'leon'