fixes for public build