Model/Mesh builder small changes