fixes for endorsments