Minor changes for cleanup