Small adjustments that ended up not fixing PHT anyway