Some more Stomp 1.1 compatibility fixes.