Minor changes in build system

It shouldn't break anything.