Fixes for use of Jersey