Minor changes for final runs