Fixes company roles association to occur when appropriate. #3.