Changes to get the console working at the clients