Bug fixes for brainstorm changes