various misc fixes on public side