Minor changes for integration into private repository.