Changes for deployment fixes.