fixes for latets build