Build matrix improvements.