Fix contexts