cleanux: fix some new issues caused by last commits