Fix minor stuff and windows