Savant build file tweaks