Post deployment fixes