more fixes for public