Adjustments to improve build system slightly