Jarv/single instance fixes