Few fixes for new resteasy