samurai compatibility changes