Adjustments on build system