Fix some attribute issue