f16bc93 Adjustments before deploy