Add a bunch of type fixes for debug/"make check" code paths.

Signed-off-by: Matthias Andree <matthias.andree@gmx.de>

6 files changed