fix public access bugs