Fix some stuff with DefineButton2 tag