Fixes to programmes