Fixed xconfig and dependency issues