Corrected some changes with bare compilations