Fix additional strict compilation warnings.