Fixes for targeting windows