Revert a couple excessive size_t returns

And get rid of a few more warnings