Pgfix

These 2 commits have been tested on TurnKey 13 RC2. Please review. Thanks!