Fixed remaining interactions