different fixes for latest implementations