Minor fixes for set manager accordion and previous merge of directive.js