fixes for pipeline