Fix the way things are called, so we silence a few warnings and assertions