Fixes for environments without p.sh variables