Fix expect issues