Brand, End message fixes