Fix things for public view