instance fixes