public side fixes