Minor fixes
Extended p4 environment