Fixed a few errors

Win7