Fix prompt issues