INF fixes for distribution