Tweak types to silence warnings