Fix linux & win compile errors found on try