Fixes for client scope conflicts