Windows fixes, standardize behavior