Fix some more compiler warnings.