Updates to PSG variables to address various issues