Several fixes and adjusting groups based on attribute changes.