Fixes for Microsoft