Fixes four more warnings