Fix more various issues