fix some bugs (Linux mint test)