Fix more unks ... (meh, @Nayd)