Add P2_BASE_DIR and small fixes

1 file changed