Small tweaks, fewer build classes