Build matrix tweak