Minor changes to prepare for deployment