More warning patches.
Nothing major, just adding type specifiers.