Consistency
Windows fixes