Event and Json Message Handlers Fixes