Bug fixes on poorly referenced attributes