Small changes to make it easier to connect