New Grid changes for companies case and other small changes