Fix endPoint security + various small improvements