Compilation fixes for test configurations.