Small fixes (JERSEY-2571 & JERSEY-2577)

Change-Id: I836b11ba910affa8ad6d16be222f042a7a73beac