Fixes for endorsed