fixes for release building.