client side fixes
base dir fix