fixes for parallel compilation