[12716m] More 541 changes. Thanks Dramacydal, TC and OpenWow