Fix more opup things