Updates for Win-SDK Beta 7

Some files updated to work with new unlock/lock command style