Bug fixes, integrated with TAM builder