Fixing LIB and common.inc BASEPATH issues