Apparently deliveryMode didn't work
A few more tweaks