+ few fixes for building without errors