Add necessary BASE_PATH where missing