Rework a bit build configurations