Fix deploy problems