Fixes to BorIP & server