Minor changes for testing