Minor changes pre-integration