Fixes to contextactivities validation