Fixed build templates