Compilation fixes for other configurations.