Various changes
Update make.conf