minor fixes to recent advancedirectives changes