Updated some 5.1 Handler.