some fixes (most for windows)