Add some stuff to prevent connection errors