fixes for special scenarios (wired/direct) in const and client