more build layout fixes v2