Minor adjustments needed after deploy