Fix up the EjbMessages commit