Build-related fix