More make tweaks