various little fix