Fixed warnings with Windows compiler.

Hope this fixes whatever issue my teachers were having. Now to propagate
the changes to the other branches...