PH: Fix contexts, locations