fixes for stable build