various misc fixes on public side
various misc fixes