Fixes to programmer events