tweak some logging/asserts