Fixes #425 and #424
Though I think the only warnings are being produced on windows, where I'd disabled tests (see #423). I've enabled them again to see what happens and try to identify the warnings.