Improved robustness & correctness for Windows Store & WPA8 implementations